when unref-ing the handlers, also invalidate them. bug nailed down by Karl

Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>

        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
        the handlers, also invalidate them. bug nailed down by Karl Nelson
        <kenelson@ece.ucdavis.edu>.

diff --git a/ChangeLog b/ChangeLog
index aa0ad980d444925ecedd8fb0f08104f78572e407..17f6c7b43d7492745c590d34aeda42fdcea85999 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+        the handlers, also invalidate them. bug nailed down by Karl Nelson
+        <kenelson@ece.ucdavis.edu>.
+
 Fri May 19 06:49:23 2000  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index aa0ad980d444925ecedd8fb0f08104f78572e407..17f6c7b43d7492745c590d34aeda42fdcea85999 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+        the handlers, also invalidate them. bug nailed down by Karl Nelson
+        <kenelson@ece.ucdavis.edu>.
+
 Fri May 19 06:49:23 2000  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index aa0ad980d444925ecedd8fb0f08104f78572e407..17f6c7b43d7492745c590d34aeda42fdcea85999 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+        the handlers, also invalidate them. bug nailed down by Karl Nelson
+        <kenelson@ece.ucdavis.edu>.
+
 Fri May 19 06:49:23 2000  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index aa0ad980d444925ecedd8fb0f08104f78572e407..17f6c7b43d7492745c590d34aeda42fdcea85999 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+        the handlers, also invalidate them. bug nailed down by Karl Nelson
+        <kenelson@ece.ucdavis.edu>.
+
 Fri May 19 06:49:23 2000  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index aa0ad980d444925ecedd8fb0f08104f78572e407..17f6c7b43d7492745c590d34aeda42fdcea85999 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+        the handlers, also invalidate them. bug nailed down by Karl Nelson
+        <kenelson@ece.ucdavis.edu>.
+
 Fri May 19 06:49:23 2000  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index aa0ad980d444925ecedd8fb0f08104f78572e407..17f6c7b43d7492745c590d34aeda42fdcea85999 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+        the handlers, also invalidate them. bug nailed down by Karl Nelson
+        <kenelson@ece.ucdavis.edu>.
+
 Fri May 19 06:49:23 2000  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index aa0ad980d444925ecedd8fb0f08104f78572e407..17f6c7b43d7492745c590d34aeda42fdcea85999 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Mar 26 03:21:28 2000  Tim Janik  <timj@gtk.org>
+
+        * gtk/gtksignal.c (gtk_signal_handlers_destroy): when unref-ing
+        the handlers, also invalidate them. bug nailed down by Karl Nelson
+        <kenelson@ece.ucdavis.edu>.
+
 Fri May 19 06:49:23 2000  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkfontsel.c (gtk_font_selection_get_font_name): handle

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index da6cedd6fab112c076cfb990d31368be25759ae4..47902f7175cbdcae6444784effcf7f981f8d48b5 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -1195,12 +1195,20 @@ gtk_signal_handlers_destroy (GtkObject *object)
          
          next = handler->next;
          if (handler->id > 0)
-           gtk_signal_handler_unref (handler, object);
+            {
+             handler->id = 0;
+             handler->blocked += 1;
+             gtk_signal_handler_unref (handler, object);
+           }
          handler = next;
        }
       handler = gtk_object_get_data_by_id (object, gtk_handler_quark);
       if (handler->id > 0)
-       gtk_signal_handler_unref (handler, object);
+        {
+         handler->id = 0;
+         handler->blocked += 1;
+         gtk_signal_handler_unref (handler, object);
+       }
     }
 }